From 438e7e9040414ba8274748167bebb9e69a246652 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Jan 2006 03:56:44 +0000 Subject: [PATCH] When deleting words, delete preceding whitespace as well. (#325358, Akkana 2006-01-02 Matthias Clasen * gtk/gtkentry.c (gtk_entry_delete_from_cursor): When deleting words, delete preceding whitespace as well. (#325358, Akkana Peck) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkentry.c | 12 ++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3dee4edf2..3ff92137f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-02 Matthias Clasen + + * gtk/gtkentry.c (gtk_entry_delete_from_cursor): When deleting + words, delete preceding whitespace as well. (#325358, Akkana Peck) + 2006-01-02 Anders Carlsson * gdk/quartz/GdkQuartzWindow.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b3dee4edf2..3ff92137f6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-01-02 Matthias Clasen + + * gtk/gtkentry.c (gtk_entry_delete_from_cursor): When deleting + words, delete preceding whitespace as well. (#325358, Akkana Peck) + 2006-01-02 Anders Carlsson * gdk/quartz/GdkQuartzWindow.c: diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index a8fa84dd97..b1e8e94d92 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2574,26 +2574,26 @@ gtk_entry_delete_from_cursor (GtkEntry *entry, if (count < 0) { /* Move to end of current word, or if not on a word, end of previous word */ - end_pos = gtk_entry_move_backward_word (entry, end_pos, TRUE); - end_pos = gtk_entry_move_forward_word (entry, end_pos, TRUE); + end_pos = gtk_entry_move_backward_word (entry, end_pos, FALSE); + end_pos = gtk_entry_move_forward_word (entry, end_pos, FALSE); } else if (count > 0) { /* Move to beginning of current word, or if not on a word, begining of next word */ - start_pos = gtk_entry_move_forward_word (entry, start_pos, TRUE); - start_pos = gtk_entry_move_backward_word (entry, start_pos, TRUE); + start_pos = gtk_entry_move_forward_word (entry, start_pos, FALSE); + start_pos = gtk_entry_move_backward_word (entry, start_pos, FALSE); } /* Fall through */ case GTK_DELETE_WORD_ENDS: while (count < 0) { - start_pos = gtk_entry_move_backward_word (entry, start_pos, TRUE); + start_pos = gtk_entry_move_backward_word (entry, start_pos, FALSE); count++; } while (count > 0) { - end_pos = gtk_entry_move_forward_word (entry, end_pos, TRUE); + end_pos = gtk_entry_move_forward_word (entry, end_pos, FALSE); count--; } gtk_editable_delete_text (editable, start_pos, end_pos); -- 2.30.2